Fix menuitem rendering in Vista

svn path=/trunk/; revision=17614

diff --git a/ChangeLog b/ChangeLog
index 5c2a15e78023bc426b501e86ccb722c1a9bc9389..01ffbb5d6b113a5ac4504795e4ec1d8671c69e11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-19  Cody Russell <bratsche@gnome.org>
+
+       * modules/engines/ms-windows/msw_style.c: Fix menuitem rendering
+       for Windows Vista.  (#392015, Hiroyuki Yamamoto)
+
 2007-04-19  Dominic Lachowicz <domlachowicz@gmail.com>
 
        * modules/engines/ms-windows/msw_style.c: Fix pixbuf leaks in

diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c
index bb149d86f1d9f5909332a6688065b3474e764e7a..51a9e2e3677806b847b3cb7476ba07be2013ca38 100755 (executable)
--- a/modules/engines/ms-windows/msw_style.c
+++ b/modules/engines/ms-windows/msw_style.c
@@ -1717,13 +1717,9 @@ draw_menu_item(GdkWindow* window, GtkWidget* widget, GtkStyle* style,
     HDC dc;
     RECT rect;
 
-    if ( xp_theme_is_active() ) {
-        return xp_theme_draw( window, XP_THEME_ELEMENT_MENU_ITEM, style,
-                              x, y, width, height, state_type, area );
-    }
-
     if( (parent = gtk_widget_get_parent(widget))
-        &&  GTK_IS_MENU_BAR(parent) )
+        && GTK_IS_MENU_BAR(parent)
+        && !xp_theme_is_active() )
     {
         bar = GTK_MENU_SHELL(parent);